[IA64] memmap: preliminary header file clean up

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/xen/include/asm-ia64/bundle.h b/xen/include/asm-ia64/bundle.h
index 7a1b11e9f325f6e8f78f87da0138c655e2eb0788..6f82398944cd178a7053707bf62132e996f7780c 100644 (file)
--- a/xen/include/asm-ia64/bundle.h
+++ b/xen/include/asm-ia64/bundle.h
@@ -223,8 +223,10 @@ typedef union U_INST64 {
     INST64_M47 M47;    // purge translation entry
 } INST64;
 
+#ifdef __XEN__
 extern unsigned long __vmx_get_domain_bundle(unsigned long iip, IA64_BUNDLE *pbundle);
 extern IA64_BUNDLE __get_domain_bundle(unsigned long iip);
+#endif
 
 #define MASK_41 ((unsigned long)0x1ffffffffff)
 

diff --git a/xen/include/asm-ia64/dom_fw.h b/xen/include/asm-ia64/dom_fw.h
index c8c13adb3243e6a268cf58b86edacdee3eb35263..3bef4bf88716dfbff5db3d1347c5a9b3fe1576f8 100644 (file)
--- a/xen/include/asm-ia64/dom_fw.h
+++ b/xen/include/asm-ia64/dom_fw.h
@@ -5,8 +5,6 @@
  *     Dan Magenheimer (dan.magenheimer@hp.com)
  */
 
-#include <linux/efi.h>
-
 /* Portion of guest physical memory space reserved for PAL/SAL/EFI/ACPI
    data and code.  */
 #define FW_BASE_PADDR          0x0000UL
@@ -184,9 +182,12 @@
 /* Additionnal OEM SAL.  */
 #define SAL_XEN_SAL_RETURN     0x02000000
 
+#ifdef __XEN__
+#include <linux/efi.h>
 extern struct ia64_pal_retval xen_pal_emulator(u64, u64, u64, u64);
 extern struct sal_ret_values sal_emulator (long index, unsigned long in1, unsigned long in2, unsigned long in3, unsigned long in4, unsigned long in5, unsigned long in6, unsigned long in7);
 extern struct ia64_pal_retval pal_emulator_static (unsigned long);
 extern efi_status_t efi_emulator (struct pt_regs *regs, unsigned long *fault);
 
 extern int dom_fw_setup (struct domain *, unsigned long bp_mpa, unsigned long maxmem);
+#endif

diff --git a/xen/include/asm-ia64/domain.h b/xen/include/asm-ia64/domain.h
index 80af70cde58b46d88604a0a410b981d345d313c9..6b92bd417b247f0f6d0ef5d15ed938ebe1d28552 100644 (file)
--- a/xen/include/asm-ia64/domain.h
+++ b/xen/include/asm-ia64/domain.h
@@ -208,10 +208,6 @@ struct arch_vcpu {
 #include <asm/uaccess.h> /* for KERNEL_DS */
 #include <asm/pgtable.h>
 
-/* Guest physical address of IO ports space.  */
-#define IO_PORTS_PADDR          0x00000ffffc000000UL
-#define IO_PORTS_SIZE           0x0000000004000000UL
-
 int
 do_perfmon_op(unsigned long cmd,
               XEN_GUEST_HANDLE(void) arg1, unsigned long arg2);

diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index 58ffb2fefef2c10547899815f23fa093bde89229..735f876f7dad786cb19f67955e9754ddf081d56b 100644 (file)
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -78,6 +78,10 @@ typedef unsigned long xen_ulong_t;
 #define MEM_G   (1UL << 30)
 #define MEM_M   (1UL << 20)
 
+/* Guest physical address of IO ports space.  */
+#define IO_PORTS_PADDR          0x00000ffffc000000UL
+#define IO_PORTS_SIZE           0x0000000004000000UL
+
 #define MMIO_START       (3 * MEM_G)
 #define MMIO_SIZE        (512 * MEM_M)